From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 26 Mar 2023 00:25:51 +0000 (-0400)
Subject: wayland: Don't crash on cursor size 0
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2^2~21^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ff892684c8cde6a18eb7a7191610c1ebb7a64a40;p=gtk%2B3.0.git

wayland: Don't crash on cursor size 0

The cursor-theme-size setting is documented as
'0 means the default size'. Make it so by using
size 24 if we see a 0. Its better than crashing.

Fixes: #5700
(cherry picked from commit 7adbbe6f35347b19319d9e4ce8c92fb0e861524b)
---

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 55c0388ec6..42a6fb8509 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -1128,6 +1128,9 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
   g_assert (display_wayland);
   g_assert (display_wayland->shm);
 
+  if (size == 0)
+    size = 24;
+
   if (g_strcmp0 (name, display_wayland->cursor_theme_name) == 0 &&
       display_wayland->cursor_theme_size == size)
     return;